From f104d8ddd7f6258a7d8c7f6035988df6f0a7994c Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 8 Feb 2018 18:29:39 +0000 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 450185 -> 450325 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 3d6e6c40234..768d6271aa7 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -77,6 +77,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index 5a5ea5d0dd32f0d4d65fb2d4283cd3d27dce62b3..cf003761617db1b390116783cf03e3e0bda16b12 100644 GIT binary patch delta 166 zcmeC&D?N3ebVCbc3sVbo3(FQ(=HmLyG=-AX;t~bj3I+Yr;v)T|%sl;+g6wqNq|(fs zl(d}0^kQp;l8n?mE(Hkia13&B^^1272ypXpbPu*oKvS)ttDBx$q5zXuFtXE6NiEaQ jE6vGC;7ZHna&(Rl4s{9+(EuC7g)phDm~~q*TW2-^#K$!o delta 29 kcmbQbPr7rjbVCbc3sVbo3(FQ(=HmALV%F{b#cXZa0H%Nn*8l(j diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b87f6fc569d..129a5ab7f65 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -238,6 +238,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # This is used to detect whether LibreOffice is being built (as opposed to building -- 2.30.2